From: Joakim Verona <joakim@verona.se>
Date: Mon, 16 Sep 2013 16:10:39 +0000 (+0200)
Subject: merge from trunk
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=c1c9aa247cab9148916b367e719219ea0f055adb;p=emacs.git

merge from trunk
---

c1c9aa247cab9148916b367e719219ea0f055adb